Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc .gitignore
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/cus-dep.el
Simple merge

diff --cc lisp/emacs-lisp/advice.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help.el
Simple merge

diff --cc lisp/progmodes/cc-langs.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc src/data.c
Simple merge